From: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
Date: Wed, 5 Sep 2018 19:46:28 +0000 (+0200)
Subject: GtkApplication: Fix CRITICAL on shutdown when register_session=FALSE
X-Git-Tag: archive/raspbian/3.24.0-3+rpi1~1^2~11
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=c562025c2fd0b7c1779128addf84ab698dcae2bc;p=gtk%2B3.0.git

GtkApplication: Fix CRITICAL on shutdown when register_session=FALSE

Origin: upstream, commit:3c7d5e749ccafa75718ef00f1d5f6cdc0defacb3
Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=908070
Applied-Upstream: 3.24.1

Gbp-Pq: Name GtkApplication-Fix-CRITICAL-on-shutdown-when-register_ses.patch
---

diff --git a/gtk/gtkapplication-dbus.c b/gtk/gtkapplication-dbus.c
index 25015eb68c..0946edf35c 100644
--- a/gtk/gtkapplication-dbus.c
+++ b/gtk/gtkapplication-dbus.c
@@ -826,15 +826,22 @@ gtk_application_impl_dbus_finalize (GObject *object)
 {
   GtkApplicationImplDBus *dbus = (GtkApplicationImplDBus *) object;
 
-  g_dbus_connection_call (dbus->session,
-                          "org.freedesktop.portal.Desktop",
-                          dbus->session_id,
-                          "org.freedesktop.portal.Session",
-                          "Close",
-                          NULL, NULL, 0, -1, NULL, NULL, NULL);
-
-  g_free (dbus->session_id);
-  g_dbus_connection_signal_unsubscribe (dbus->session, dbus->state_changed_handler);
+  if (dbus->session_id)
+    {
+      g_dbus_connection_call (dbus->session,
+                              "org.freedesktop.portal.Desktop",
+                              dbus->session_id,
+                              "org.freedesktop.portal.Session",
+                              "Close",
+                              NULL, NULL, 0, -1, NULL, NULL, NULL);
+
+      g_free (dbus->session_id);
+    }
+
+  if (dbus->state_changed_handler)
+    g_dbus_connection_signal_unsubscribe (dbus->session,
+                                          dbus->state_changed_handler);
+
   g_clear_object (&dbus->inhibit_proxy);
   g_slist_free_full (dbus->inhibit_handles, inhibit_handle_free);
   g_free (dbus->app_menu_path);